Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 19 Aug 2011 14:28:36 +0000 (07:28 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 19 Aug 2011 14:28:36 +0000 (07:28 -0700)
commitba81f1a612e3783bd9cbba93584005d57be39224
tree10011eec71fe43e30c9d252deb8c54a654ad595a
parented9bbca9a498921a2621ebee642953c709903b03
parenta1f3b9d0bea1dec5dca8b167e6a955549951e804
Merge from trunk.
src/ChangeLog
src/xdisp.c
src/xfaces.c